From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 18 Sep 2011 15:21:57 +0000 (-0400)
Subject: Merge changes from emacs-23 branch
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2225
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=90e0a38be8532804e8348845b161d7a40171cd7a;p=emacs.git

Merge changes from emacs-23 branch
---

90e0a38be8532804e8348845b161d7a40171cd7a
diff --cc src/ChangeLog
index 26b29320bc2,1cc60dd0586..84258e2fc24
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,7 -1,13 +1,17 @@@
+ 2011-09-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+ 
+ 	* xdisp.c (expose_window): Save original value of phys_cursor_on_p
+ 	and turn window cursor on if cleared (Bug#9415).
+ 
+ 2011-09-18  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+ 	* search.c (boyer_moore): Take unibyte characters from pattern
+ 	literally.  (Bug#9458)
+ 
 +2011-09-18  Eli Zaretskii  <eliz@gnu.org>
 +
 +	* xdisp.c (reseat_at_next_visible_line_start): Fix last change.
 +
  2011-09-18  Paul Eggert  <eggert@cs.ucla.edu>
  
  	Fix minor problem found by static checking.